Update before 2.1.2 release