Added debug variants of the enable/disable macros.
Merge commit 'ebedb44' into develop