.......... [ZBXNEXT-1826] updated to latest from trunk