Preparation for version 2.2