.......... [ZBX-7448] merged to trunk