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