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