Closing this, 17.3.5 is in staging.