rails/rails

Fix parent record should not get saved with duplicate children records

#32952

mechanicles wants to merge mechanicles:32940-fix into rails:master