Merge "RVCVXCheck temporarily disabled" into mnc-dev