am dda63545: Merge "Improving maps output."

* commit 'dda635455fb085d2f33fd1bdc5140805a055ea05':
  Improving maps output.