Update to 3.1.17 + patches