Remove: MACRO -> \'ADD_ROOT\'
Task-Complete
Merge branch 'retirement/ADD_ROOT' into develop