Merge "Work on issue #62095840: NPE in JobParamteres in the background" into oc-dev