Merge branch 'jc/maint-diff-q-filter'