3.5 3.6 commit