Merging develop_SW-84

Changes to UART emulation to speed up simulation.