Merge remote-tracking branch 'upstream/2019.03-RC' into worker2