Yup, that's the plan. At the very least we will come out with an RFC/implementation plan for the issue if it proves too big for the next week.