Sync with 21.2

Most of the code in this package 21.9 wasn't properly cherry picked, it was more of an ad hoc copy, which means sweeps from 21.2 fail now.

This looks like a lot of changes, but it's mostly copyright date changes to keep things in sync.