PR: 41318 Submitted by: Ronald Kuehn <rk@ronald.org>
PR: 33961 Submitted by: Ronald Kuehn <rk@ronald.org>