Fix rollbar issues
Update vcr
Merge branch 'master' into staging