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