[mx2] Merge latest matricom sources into master