Closes #6086
Merge branch 'hotfix/6086'

* hotfix/6086:
  move individual function into data provider instead
  Fixes #6082
Fix: No need to prefix imports
Merge branch 'cs/#5029-imports-fqcn-not-prefixed-with-global-ns' into develop

Close #5029
Forward Port #5029