I've reworked the patch for this bug to be independently appliable. Attaching patches for master, ussuri, train, and stein.
I've reworked the patch for this bug to be independently appliable. Attaching patches for master, ussuri, train, and stein.