I'm dropping the dependency on the 4.11 bug 2040533. This 4.9.z bug only needs to depend on the 4.10 bug 2050250.
Duplicating this BZ to 2024643... The patch was pulled in via a rebase. *** This bug has been marked as a duplicate of bug 2024643 ***