#458 - Remove contact info labels when empty
Merge branch '458' into develop