The patch needed a testcase update as well. Squashed 2 commits from upstream
- Previous versions also fixed bug #948731