Merge branch 'refactor/locked_user_field' into 'develop'