Merge "Adjust for pipeline stalls" into mnc-dev