Fix duplicate import statements
Merge branch 'develop' into pr/452