2.0 -> 2.1 migration scripts #2090