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