Imported jobwrapper from 1.15