.......... [ZBXNEXT-949] Merge from trunk.