PR: 26154 Submitted by: Scot W. Hetzel <hetzels@westbend.net>
(Classic version). PR: 24313 Submitted by: Geoffrey C. Speicher <geoff@sea-incorporated.com>