Merge branch 'rs/trace2-dst-warning'