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