Final commit for 1.5