Update for 1.2.0 rls-b4