Patch for 8.0

Approved by: Marc Alff <marc.alff@oracle.com>
Approved by: Chris Powers <chris.powers@oracle.com>
Approved by: Sivert Sorumgaard <sivert.sorumgaard@oracle.com>
Approved by: Tor Didriksen <tor.didriksen@oracle.com>