PR: 94972 Submitted by: "Frank W. Josellis" <frank@dynamical-systems.org>
PR: ports/93892 Submitted by: ijliao