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