enable debugger for debug builds
merge upstream