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