Commits

Miks Kronkalns authored d3f8d33f65eM
.......... [ZBXNEXT-6167,ZBXNEXT-6168] updated to latest from release/5.0 (without conflicts)
Showing diff to4bec606147d
Everything looks good. We'll let you know here if there's anything you should know about.