disable default log
Merge branch 'fix/fixes' into develop