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