new upstream, versioning scheme changed back to v 1.x (cherry picked from commit 5a8cd34dba52fc35d25e24f41a17069e2254e609)