Upstream version 20190102