HHH-8548 - HHH-3047 causes regressions