Port 'jmarchan-fixSwapCrates' into 'sim11/run5-ideal'

Menglin Xurequested to merge
cherry-pick-b3e960f7 into sim11/run5-ideal

Swap crates 11 and 13

See merge request !145 (merged)

(cherry picked from commit b3e960f7)

5c7dd204 Swap crates 11 and 13

Merge request reports