Merge "Enable new pipeline on teamfood and master"