Keep an item's user data rows in agreement Original-merge: fc98019b12 Merged-by: crobibero <cody@robibe.ro> Backported-by: Cody Robibero <cody@robibe.ro>
fc98019b12