Merge commit d30f2cb6 from release-2020 into master