A......... [ZBXNEXT-1133] Patch back in changes lost in trunk merge.