server-1.20-branch build fix backports

Merge request reports