Final commit for 1.2