Thanks Craig de Stigter for the report and collaboration on the patch. Backport of cc3c4a9d from master.