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