Update to v3.31