PR: 28075 Submitted by: Patrick Li <pat@databits.net>
PR: 23407 Submitted by: Greg Greenaae <greg@gregnet.net>