updated to 3.17-rc4