Upstream version 20170719