HHH-4150 - Fix and test
HHH-7608 - Fix and test