Merge conflicts from stash
SD-56468332-enable export for filtering options selected
Update vcr
Fix export school assignment
Update admin filtering options for connections
Add cache_method
Add cache_method 2
Add more timings for export performance
Attempt to improve export performance
Merge branch 'master' into production