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