prepared for 1.12 development