2.0.2 release merge