frosch 8c9d7808b1 Merge r25272 to 1.12 release branch 13 lat temu
..
Zend 8c9d7808b1 Merge r25272 to 1.12 release branch 13 lat temu