Merge changes from 2.0.1