HHH-9529

Test case and fix