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