#691 - Preserve order of DynamicForms