Merge "Fixed gating pipeline issue"