Issue#563 settings rebase

Closes #593
Closes #564