Merge main into cel shader branch

[aeonic-dev]

Oops, these changes have already merged to main - looks like the branch was mistakenly left up. Absolutely not my fault