PR: 59124 Submitted by: Ports Fury
Submitted by: maintainer
PR: 19370 Submitted by: Kelly Yancey <kbyanc@posi.net>