Change dependency management
Add master changes to develop