HCOLL-167 improving stateless map