Upgrade brightray for #849