Upstream version 20171204