.......... [ZBXNEXT-2124] Fix issues with merge from 2.2.4, tested