Summary: Also reviewed by: boris.molodenkov@oracle.com
Reviewed-by: dcubed, minqi, mschoene
Contributed-by: yasuenag@gmail.com, bengt.rutisson@oracle.com