PR: 38882 Submitted by: Hiroyuki Une <harrier@seiryu.cim.hkg.ac.jp>
PR: 36893 Submitted by: Ports Fury
PR: 20654 Submitted by: Ports Fury