Fix advanced options behaviour
Minor fixes
Squashed 'core/' content from commit a36ccfa

git-subtree-dir: core
git-subtree-split: a36ccfa36c3c246c8cc43c83aca77a1fd2629b82
Merge commit 'a419d1b471f06798a8d8df9d2dac08ca881bd3d5' as 'core'
Use core include