update to branch 1.2