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