Commit all changes from 2.9 branch