Upstream version 20180504