.......... [ZBX-7968] merged from upstream