Fixed the issue with circular dependency
Merge branch 'develop' of https://github.com/confa/Azimuth into develop