Final commit for RC2