merged release-1.0.2