Updating dependencies
Merge branch 'topic/update-dependencies' into develop