added define ENABLE_LOGGING
Merge branch 'm0704'