PR: 53171 Submitted by: maintainer
PR: 52406 Submitted by: Michael Nottebrock <michaelnottebrock@gmx.net> et. al.