HHH-7918 - Fix and test