Merge branch 'debug-window'