Sync with 1.0.1 branch.