Fixing setting scope
Merge branch 'hotfix-storescope'