Merge branch 'develop' into oauth-tests-poc