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