Merge branch '923_oauth_controller_refactoring_p2' into 'develop'