am 437a5c63: Merge "Fix coordinate count" into jb-mr2-dev

* commit '437a5c6358226aa668fa5bd25699f3aeb2059bbd':
  Fix coordinate count