Merge latest toast

Merged in the latest Toast, carefully merged.