Noting that if this is backported to 3.3, the fix for bug 1857710 will need to be added to 3.3 as well.
Noting that if this is backported to 3.3, the fix for bug 1857710 will need to be added to 3.3 as well.