Changes for 1.12