merge to 1.0.ga patch code