Merge branch 'tr/maint-roff-quote' into maint