Upstream version 20180516