Sync'd with 0.9.5
Fogot to bump the version in cloudflare.json to 0.9.5