Switching to the new_leaf check does indeed seem to solve this bug and bug #889872. Will propose new merge.
Switching to the new_leaf check does indeed seem to solve this bug and bug #889872. Will propose new merge.