Missed to check-in
CLINPORTAL-7302: The order of controls within page was not maintained while migrating forms. Fixed this by first sorting the controls and then iterating