Upstream release 149.0