Merge Roberts recent changes