...G...... [ZBX-7098] changes after code review (part1)