...G...PS. [ZBX-8391] merged from latest trunk