Note to other SRU members: part of this change is also the addition of a few autoremove calls, but that's fine.
Note to other SRU members: part of this change is also the addition of a few autoremove calls, but that's fine.