.......... [ZBX-8188] created development branch to resolve conflicts merging into 2.2