Merge branch 'kb/maint-status-cquote' into maint