Prepared Debugging Menu
merged upstream change