Merge "Reduce pipe length" into mnc-dev