Merge branch '2019-08-02-autoboot-cleanup'