Upstream version 20180510