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