Merge branch 'new-baudrate-code'