Upstream release of v1.9.0