Upstream version 20170902