Merging changes from main into 0.9.1 branch.

We aren't making another branch since we haven't launched kafka into production yet.