Merge "Temporary tracking of JobStatus unprepare" into oc-dev