Merge "(bug 37072) - prevents infinite job loop"