........S. [ZBX-7901] code improvements