Thanks Stanislas Guerra for the report and Tomas Ehrlich for the review. Backport of cd0ceaa1 from master.