Baked bits from !12006
Merging down some of !12006 (merged) so it's not such a lengthy queue to work with. @daenzer had acked most of these but not all I don't think, so I didn't want to tag one wrong.
Merging down some of !12006 (merged) so it's not such a lengthy queue to work with. @daenzer had acked most of these but not all I don't think, so I didn't want to tag one wrong.