Additional changes necessary for releasing a RC