PR: 50768 Submitted by: Reinhard Lenninger <reinhard.lenninger@web.de>
PR: 24573 Submitted by: Trenton Schulz <twschulz@cord.edu>