...G...... [ZBX-8327] fixed merging from 2.2 version