Make sure all these URLs are forced through to next gen in Fastly, otherwise Google will pick them up and 404 on the R2 site and you will have the SEO guys on your backs.