trying to fix merge issue on media quotes
try 3
Merge branch 'develop' into staging
Merge branch 'staging'