Merge pull request #5988 from dragnea/dragnea_autolaunch_refactor