Update dependencies
Merge updates