Yes, that is the plan, although there's no reason not to get the current patch in the meantime...