Merge branch '2020.09-rc' into stable