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