Revert commit "remove useless pointer of pointer"
Merge remote-tracking branch 'origin/mapping' into developer