Merge feature-docs to main with rebase

[hildjj]

I just rebased feature-docs onto main. This is probably the right way to do it. I'm going to stop using the feature-docs branch.