merge 2.7.12 release branch