.......... [ZBX-3336] merged with current trunk