Merge "CORD-2965 fix crash when Job resources encountered"