Merge "Improve coarse locations." into jb-mr1-dev