[#1711] group_dict_save: save extras before session.commit+rebuild