Update to 3.17.2. Fixes for 3.17.1 regressions