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