#7108 Needs to be backported to 2.x, but there are non-trivial conflicts.