Merge commit '93d89f63e5a297f8672daf5d8b7b4df2a999af61' into upstream-merge