main
refactor: rename and deprecate proxy named stuff (#4932)
chore: remove overzealous destructuring (#6930)