PR: 34580 Submitted by: Joe Marcus Clarke <marcus@marcuscom.com>
PR: 33835 Submitted by: Joe Marcus Clarke <marcus@marcuscom.com>