4.7.x-1.0
b4ad22e0 · #93590 fix by Egon, backport from HEAD ·