Add missing import
Merge branch 'hotfix/next' into develop