Merge "Fix gating pipeline"