Rename local variables to avoid conflict with local imports
Merge pull request #2262 from 9rnsr/fix_imports

Rename local variables to avoid conflict with local imports
Add missing imports
Merge pull request #2268 from 9rnsr/fix12359

Add missing imports