Set surrogate control for everything, no matter what
Merge branch 'leo/fastly'