Update to v3.1.8.5