Merge branch 'develop' into 'feature/local-only-scope'