Merge conflicts from stash
SD-56468332-enable export for filtering options selected
Update vcr
Merge branch 'master' into staging