Upstream version 20170903