CDE debug change should be done, these 3 commits should be squashed and renamed