+++ This bug was initially created as a clone of Bug #2346194 +++ Those patches got into the 8.0 branch already as 8.0z3 is primarily for the cloud team. We also need to make sure all of those patches get into the 8.1 branch. It sort of ended up happening backwards, but as long as we get the patches in, it should be fine.