ZF-3726, ZF-10681, Applying patches from Jurian
ZF-3726, ZF-10681, Applying patches from Jurian

git-svn-id: abaeb2b3ba5a94ed391a9405ad7d63d0414021c9@23361 44c647ce-9c0f-0410-b52a-842ac1e357ba

ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1