Upstream version 20191018.00