#90: Group comment options in a new tab content
Merge remote-tracking branch 'origin/master'