Batch-2144

Many of these commits are already on master so you'll need to pull those into your branch before merging mine.  The only commit I want to add to your branch is the last one.