L2DTS-272: Turn XSTs into a matrix before transposing, not afterwards Closes L2DTS-272 See merge request !16