merge release v1.2