Upstream version 20180603