Merge "Update some direct dependencies"