.......... [ZBX-8391] updated from latest trunk