Merge branch 'ndac-todoroki-niconico_nm'