v1.2 final commit