Merge branch 'sv/maint-diff-q-clear-fix' into maint