Merged Version 12 into 11, some things are still not working (Oscilloscope and setting test-cases)