Upstream version 3.1.35