Merge branch 'cherry-pick-a3e0c26d' into 'release-20.2'

Merge branch 'fix-docker-image-proj' into 'master'

See merge request !3918
1 job for 20.2.1 in 3 minutes and 17 seconds
latest