merge with 1.2 for 1.2 release