Merge branch 'dev'
Disabled dev logger
Merge branch 'master' into dev