BZ-1113507 - When saving, user sometimes gets 'data model updated' Error modal (edit)