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