merge with 2.0.2 changes