Commit for 2.2 - combined