Release 2.0

This is a cumulative pull request for all 2.0 stories onto `master`.