Update to 3.17