Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev