Merge branch '2021-09-07-ATAGs-and-related-migration' into next