Merge from upstream until 7d0d377dc303d9396b5527e0fe2256d65ca7ed00