Thanks julien.aubert.mail@ for the report and James Pic for the patch. Backport of 64d0f89ab1 from master