Backported to 3 2 explicit parts order

Backport to fix #11092 for 3.2 rails, which was fixed in 4.0 by #7978