Manual Merge of Several PRs

This was a manual merge since each of these was conflicting due to the changing import statements at the top. I really wish Github allowed easily handling these ...