HHH-8497 - Fix and test