Merge "Revert "Fix and cleanup."" into mnc-dev