Preparation for 3.2.1