Fix for logging in files
Merge remote-tracking branch 'origin/dev' into dev