Merge "Fix global-templates unstable jobs"