[2.1] Create the 2.1 branch