Merge "Use new library versions"