.......... [ZBX-3336] reintegrated to trunk