Merge tag 'v2021.01-rc5' into next