Merge pull request #20174 from ysc3839/natmap