Merge pull request #8791 from tobiasd/2020.06-rc