Merge remote-tracking branch 'upstream/2020.12-rc' into notices