The fix presented in HHH-5908 In Progress resolves this particular issue. I'll be pushing the fix as a part of HHH-5908 In Progress and will include an Enver's test case for this issue.