debug features merge

Merged together because "de" was missnamed