Final commit for 1.4.2