..F....... [ZBXNEXT-2124] Backport from trunk