PR: 53795 Submitted by: Jan Stocker <Jan.Stocker@t-online.de> (maintainer)
PR: 52953 Submitted by: Jan Stocker <Jan.Stocker@t-online.de>