Polishing for release.
Preparing for 2.2.1 release.