Merging fix for 1875c1f30f, a84b20edd