This should also be backported to 1.11 and 1.10.