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