Updates and plan for 2.1 [LONG]