rob 7b2ca1df94 merge r25094 to release-1.12 13 lat temu
..
Zend 7b2ca1df94 merge r25094 to release-1.12 13 lat temu