Upstream version 17.35.13