Merge branch 'develop' into refactor/discoverable_user_field