Sort the nested part fields in the correct order on the edit form
Remove test debugging
Merge remote branch 'origin/fix-sort-order'