Matt Shaw yes I was able to fix both this and the related issue HHH-11768 Open . I submitted a PR and its under peer review. The plan is for it to be included in the next release which should be out in the next week or two.