merge 2.0.1 changes