Add forgotten import
Merge branch 'hotfix-17.23.1'