PR: 33924, 34812 Submitted by: maintainer
PR: 32553 Submitted by: maintainer
(Classic version). PR: 24313 Submitted by: Geoffrey C. Speicher <geoff@sea-incorporated.com>