.......... [ZBX-8391] updated to the latest trunk