Fix private settings changes
Merge branch 'pr/1'
Changes