PR: 23806 Submitted by: Yen-Ming Lee <leeym@bsd.ce.ntu.edu.tw>
PR: 3702 Submitted by: Trefor S. <trefor@flevel.co.uk>