Bug#675345: merge with #694962

[Katsuhiko Nishimra]

forcemerge 694962 675345

Sorry, I failed to merge bugs. I hope this mail will work.