........S. [ZBX-1274] code improvement