FORMS-235 #time 15m Fixing issue with editing.