Upstream version 20171219