Merge branch 'hotfix/4640'

Close #4640
Add use statements
Merge branch 'hotfix/4643' into develop

Forward port #4643