25/04 commit