HHH-8602 - Fix and test