Merge "Sync and cleanup pass over support-v4" into mnc-ub-dev