Add setting to specify protected regions
Merge branch 'master' into protected-regions-merge
Merge branch 'master' into protected-regions-merge