Merge branch 'master' into branch-5f537081

# Conflicts:
#	enterprise/frontend/test/metabase-enterprise/sandboxes/sandboxes.cy.spec.js
#	frontend/test/metabase-db/mysql/custom-column.cy.spec.js
#	frontend/test/metabase/scenarios/admin/datamodel/metadata.cy.spec.js
#	frontend/test/metabase/scenarios/admin/settings/localization.cy.spec.js
#	frontend/test/metabase/scenarios/dashboard/dashboard-drill.cy.spec.js
#	frontend/test/metabase/scenarios/dashboard/x-rays.cy.spec.js
#	frontend/test/metabase/scenarios/question/custom_column.cy.spec.js
#	frontend/test/metabase/scenarios/question/filter.cy.spec.js
#	frontend/test/metabase/scenarios/question/nested.cy.spec.js
#	frontend/test/metabase/scenarios/question/new.cy.spec.js
#	frontend/test/metabase/scenarios/question/notebook.cy.spec.js
#	frontend/test/metabase/scenarios/question/nulls.cy.spec.js
#	frontend/test/metabase/scenarios/visualizations/drillthroughs/chart_drill.cy.spec.js
#	frontend/test/metabase/scenarios/visualizations/drillthroughs/dash_drill.cy.spec.js
#	frontend/test/snapshot-creators/default.cy.snap.js