Fix circular imports

Amir MOHAMMADI requested to merge deprecation into master

Merge request reports