This commit contains the changes from generate_auto_job based on manual changes from the previous commit.