Almost ready for final 1.2.0 push