Commits

Vladislavs Sokurenko authored a34d35681f9
...G...PS. [ZBXNEXT-6840] cherry picked from 5.0 and fixed conflict in trapper.c (cherry picked from commit 84efddb04ec9ceb7743d30c711c0afac12bbf777)
Everything looks good. We'll let you know here if there's anything you should know about.