Upstream version 20180209