Fix proposal for HHH-8373
added test case to reproduce HHH-8373