Merge branch 'master-upstream' into python_bindings

Former-commit-id: 7ab27d4615c7b804e05bf42ffc86b532e26b9e66