Catch up with 5.4-Release.
Submitted by: kano at na rim or jp Coordinated by: Nobuyuki Koganemaru <n-kogane at syd odn ne jp>