Reviewed-by: psandoz, plevart
Co-authored-by: John Rose <john.r.rose@oracle.com> Reviewed-by: vlivanov