Preparation for 1.12 whitelist