Merge branch 'refactor/discoverable_user_field' into 'develop'