Merge "extract cleanup jobs from run method in ModuleDef" into oc-dev