Upstream version 20190215