Last major additions before RC2