1.0.2 merge