Updated for 0.9.7.12 release