Upgrade to v2.0.1

This is a clean merge of v2.0.1 upstream tag.