I verified this fixed the issue and it has now been merged into upstream stable/pike. I'll close the bug.
I verified this fixed the issue and it has now been merged into upstream stable/pike. I'll close the bug.