Progress commit
Settings updates
Merge branch 'release/0.6.6'