rob 07187bfb99 merge r25104 to release-1.12 13 lat temu
..
Zend 07187bfb99 merge r25104 to release-1.12 13 lat temu