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