Upstream version 20190203a