PR: 205326 Submitted by: Tomoyuki Sakurai <trombik1973@gmail.com> (latest version), me (original version)