Rebase 10.5 patches onto 78.10esr
c7a6da97