Code freeze for 2.1 builds