PR: 37963 Submitted by: obraun@informatik.unibw-muenchen.de
* Split patches one file per patch * Whitespace nits PR: 15720 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>