Merge from kagashenshi