Update to v3.36