Merge branch 'develop' into refactor/deactivated_user_field