HHH-8049 - Fix and test