VIVO-527 VIVO-526 VIVO-528 property visibility and annotations