Upstream version 20180220