.......... [ZBXNEXT-2637] sync to trunk