matthew 2ee4633318 Merge r25276 - r25278 from trunk 13 lat temu
..
Zend 2ee4633318 Merge r25276 - r25278 from trunk 13 lat temu