Merge branch 'kusanagi-discipline-update' into kusanagi