i suggest from my observation of things that going from 2.0 to 2.1 has breaking changes, A (partial) fresh setup would be benefitial for Level-[01]-Support and for the users to understand, (my 50cent)