Merge branch 'feature/add_user_group_enter_key_validate' into develop