Merge branch 'feature/deps-migration' into 'develop'