Upstream version 20171220