We should forward port https://github.com/voila-dashboards/voila/pull/1482 onto the main branch