Merge branch 'upstream' into 18.08.x