Post 3.2.1 preparation.