am 494bd36d: am dda63545: Merge "Improving maps output."

* commit '494bd36d463eeae6398ee340872e6356e498396d':
  Improving maps output.