Thanks James Rivett-Carnac for the report and Markus Holtermann for the review. Backport of e11c6fd2 from master.