Update types to 1.2
Update branch to 1.2 and fix conflicts