Merge 'upstream/2.x' into 'upstream/3.0'

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>