Upstream version 20180509