Merge commit 'f0138a63a41fe26bcef61d031ae53d872d12a992' into upstream-merge