.......PS. [ZBX-7576] backported the fix from 2.2, no conflicts