Thanks James Cleveland for the report and Aymeric for suggesting the solution. Backport of da599022 from master