Merge "Fix for non persisted jobs being persisted"