Initial installer rework
Finalize installer for a while
Merge branch 'master' into installer