Merge "Fix coordinate count" into jb-mr2-dev