Merge branch 'refactor/deactivated_user_field' into 'develop'