A......... [ZBXNEXT-1583] Re-apply changes undone by merge from trunk (due to DEV-536).