A.F....... [ZBXNEXT-686] updated to latest trunk