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