Uncommited changes commited before new setup merged from master
new settings unofficially merged from master