Merge commit 'd17b5288d91c935cc8795fa0620721da0a3865e1' into upstream-merge