PR: ports/173895 [1] PR: ports/173891 [2] Submitted by: Chris Petrik <c.petrik.sosa@gmail.com> [1] (based on) Submitted by: Mamoru Sakaue <sakaue.mamoru@mwghennndo.com> [2] (based on)