...G...... [ZBX-3336] updated to trunk