Merge "Update dependencies"