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