Tagging the current 3.17 development for merging to the trunk since I need the fixes in #2229 and #2235 when testing #2234.