Merge pull request #6138 from ysc3839/natmap