Missed updating the code for 4.1 style single log file
Merge branch 'hotfix/0.5.1'