Changes

required before 2.2.0 release

Already done