Patch for 5.7

Approved by: Marc Alff <marc.alff@oracle.com>
Approved by: Chris Powers <chris.powers@oracle.com>