Issue #3487743: Patch from security team. It needed a rebase too.
11.x
7.x
changed target branch from 11.x to 7.x