Upstream version 20180511