Add scope support for model get and set operations
Merge branch 'add-model-scoping'