Merge commit '53633a893a06bd5a0c807287d9cc29337806eaf7' as 'dts/upstream'