Update relnotes
Fold in changes
Revert "Fix soledad imports (#5989)."

This reverts commit 7fcc4f40eaa8214de8ae20cd71d173337ad64290.
Merge branch 'release-0.7.0'
Fix soledad imports (#5989).