Upstream version 17.36.1