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