FORMS-115 #time 55m Fix an issue that caused ordinals to get out of sync if some controls were removed.