Merge branch 'develop' into 'fix/oauth-compile-time'