MBS-6905: Correctly render empty coordinates
Merge branch 'mbs-6905' into beta