Merge branch 'patch-6' into 'release-20.2'

20.2.3

See merge request !4706
1 job for latest-20.2 in 15 minutes and 22 seconds (queued for 19 minutes and 39 seconds)
latest