am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev