Upstream version 20170919