Merge "Ensure DEBUG_ENABLED define gets set when building in debug mode" into devel...