Merge "Fix issue #38210653: Few more tweaks of job scheduler" into oc-dev