merge: merging master into software_simulation to run testbench on latest switch implementation.
merge: merging master into software_simulation to run testbench on latest switch implementation.
merge: merging master into software_simulation to run testbench on latest switch implementation.