Merge commit 'remotes/smcv/ready/harishcm-map-fix' into staging