Change based on comments of Andres
Fix first patch based on previous comments
Fix some crashes
Correct a comment
Fix catalog version
Merge branch 'toastindex' into reconcurrent2
Fix some comments