Results 11 comments of Onyx and Iris

Fantastic, thanks for this PR! I hope it gets merged. Note, this PR is in relation to discussion #661