#12-30 commit