Upgrade brightray for #646