M2M mapping update

Maurizio Pillitu requested to merge workspace/kenneth-hei/Apr_08 into master Apr 12, 2021