Merge branch 'master-upstream' into python_bindings

Former-commit-id: dfbb411d9df9119b4b854aab1f9aec619e37e76b