Upstream version 4+git20190417