.......... [ZBXNEXT-2398] Commit missed files in merge from trunk.