catch-up commit from last night
Merge branch 'diffs'