Merge "Fix for Pike/Queens Jobs"