Merge "Compatibility hack" into mnc-dev