compile time log control enabled
Merge branch 'dev'