JHC-11869

JHC-11869