New files after 2.1RC merge