Add missed import while cherry-picking d0beccd
Merge pull request #6978 from s0undt3ch/0.16-merge

Add missed import while cherry-picking d0beccd