Merge "Add private helpers needed for job queue." into oc-dev