Catch up merge from 2.0.1 into 2.1

Merges all changes from the 2.0.1 branch into the 2.1 branch.