.......... [ZBX-8092] applied changes from 2.2 and resolved conflicts in src/zabbix_server/poller/checks_calculated.c and src/libs/zbxserver/expression.c