Since there is a consensus-changing release planned, if it got postponed again, we'll release this alone, otherwise merge this with that milestone.