Rebase 10.5 patches onto 78.7.0esr

56ab7e2d

Edited by Georg Koppen