PR: 33082 Submitted by: Ulrich Spoerlein <q@uni.de> Approved by: obrien (mentor)
PR: 12624 Submitted by: Jason Brazile <jason.brazile@netcetera.ch>