Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415