Preparation for 1.12