Changes for v1.2 release