PR: 33864, 33865 Submitted by: Hye-Shik Chang <perky@fallin.lv>, HAYASHI Yasushi <yasi@yasi.to>
PR: 27267 Submitted by: Johann Visagie <johann@egenetics.com>