PR of initial master commits

Autostart does not default to false. it defaults to true.