Config for master-all-views
Merge branch 'fix-1' into master-all-views