frosch 8522b6b850 Merge r25224 to 1.12 release branch 13 lat temu
..
Zend 8522b6b850 Merge r25224 to 1.12 release branch 13 lat temu