Merge latest origin/main and reconcile workspace side-panel conflicts
#3010
+2,709
−768
origin/main and reconcile workspace side-panel conflicts
#3010