Merged commit fb37ebca313e077a7911c81a163c67383d6e4434 from 1.7.9 (by @srgg )