Skip to content

Fixes for 1.20 branch

Cherry picks from master.

Merge request reports