Added r4123 (make xtc_sorting "functional") an r4124 (add missing "parameters" parameter to r4123) from SP1e to trunk