HHH-8036 - Fix and test