Hi Gail! Thanks for looking into HHH-12436 Open . It does not yet resolve this issue. I've left a comment on your PR why I am sure this is the case. I've rebased my branch upon yours so that we can hopefully combine the two.