Merge branch release-2020 into merge-2020-into-2021