Final commit before 3.6