Is this really necessary?
Is this really necessary?

Merge remote-tracking branch 'upstream/develop' into develop

fle-internal/content-curation,jayoshih/content-curation,fle-internal/content-curation,fle-internal/content-curation,jayoshih/content-curation,jayoshih/content-curation,jayoshih/content-curation,DXCanas/content-curation,jonboiser/content-curation,DXCanas/content-curation,jonboiser/content-curation,fle-internal/content-curation,DXCanas/content-curation,DXCanas/content-curation,jonboiser/content-curation,jonboiser/content-curation