merged latest code from application_group_models branch