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