2.18 commit