Upstream version 20180102