PR: 4988 Submitted by: Bruce Gingery <bgingery@gtcs.com>
PR: 4219 Submitted by: Bruce Gingery <bgingery@gtcs.com>