Revert "Merge branch 'porting2' into bigmix"