Fix: Unnecessary FCQN
Merge branch 'cs/#6917-unnecessary-fqcn-removal'

Close #6917