Merge "Missing modifications for DistributeTraffic actions" into dublin