Merge branch 'roblou/allied-hornet' into roblou/simple-summarization