Patch proposal and testcase for HHH-7304