Add use statements
Merge branch 'hotfix/4643'

Close #4643