official 1.5 commit