teranishi commit_2142