Fix incorrect variable name
Merge branch 'toastindex' into reconcurrent