Done. The new PR is #3421.