BAMPFA-23: Temporary fix for CSPACE-6234.
Merge branch 'ucb-deploy_4.0' into cinefiles_4.0