..F....... [ZBXNEXT-2301] fixed last merge