Baseline to latest set of changes with mAptiv core support.