Merge pull request #20150 from ysc3839/natmap-fix