Spiked IScopeStore rework
Merge branch 'ScopeStoreRework' into dev