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