HCOLL-167 tightened visibility