Incorporate 3.12.9 stable changes