Update to 3.17.1