Upstream version 20180302