HHH-8373 - Test case + Fix proposal