Linked yet another more recent branch in which the fix for this bug was redesigned to avoid bug 953089.
Linked yet another more recent branch in which the fix for this bug was redesigned to avoid bug 953089.