Rebase to v2.0.1

This is a new branch from the upstream v2.0.1 tag with our patches.