maki notifies teiji.
resolve conflict
Merge branch 'tossh0095-notify_teiji'