HHH-7437 - Fix and test