Upstream version 20171202