Merge branch 'master' into fix-load-viewport

Author: aerosol

assets/js/dashboard/extra/exploration.js

@@ -896,13 +896,13 @@ export function FunnelExploration() {
               loading={isActive ? (initialLoading || activeColumnLoading) : false}
               selected={steps[i] || null}
               selectedVisitors={
-                funnel[i]?.visitors ??
                 provisionalFunnelEntries[i]?.visitors ??
+                funnel[i]?.visitors ??
                 null
               }
               selectedConversionRate={
-                funnel[i]?.conversion_rate ??
                 provisionalFunnelEntries[i]?.conversion_rate ??
+                funnel[i]?.conversion_rate ??
                 null
               }
               maxVisitors={funnel[0]?.visitors ?? null}