Merge branch 'cs/#6917-unnecessary-fqcn-removal'

Close #6917
Fix: Yet another unused local variable
Merge branch 'cs/#6916-remove-unused-db-variable-in-db2-select-decorator' into develop

Close #6916