Merge branch 'cc/quote-comments' into maint