Merge branch 'patch-5' into 'release-20.3'

20.3.1

See merge request !4705
1 job for latest-20.3 in 16 minutes and 27 seconds (queued for 17 minutes and 1 second)
latest