(cherry picked from commit 1843c4688a3040c48f6834d166494cbf68b5e4fd) Conflicts: LICENSE-binary (cherry picked from commit d39ebbfebc9da982cadfbe92f3fb6677e744622d)