Merge commit 'dbb1413589512574519abcf52a9a7127ddc7844b' into upstream-merge