I have changed the patch to confirm to latest 7.x branch.