Updated for 1.12 release