Merges of 2.0 and 2.1, nothing too crazy. Refer to 2.0 for more info.