PR: 57749 Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
PR: 48127 Submitted by: Andre Ramos <andre.ramos@netcabo.pt>