Noting that when this is backported to 3.1.x, the fixes for bug 1792621 and bug 1792429 should be backported as well.
Noting that when this is backported to 3.1.x, the fixes for bug 1792621 and bug 1792429 should be backported as well.