Merge remote-tracking branch 'lucas/Code injection in debugger'