Merge branch 'hotfix/0.3.2'
[skip ci]
Merge branch 'release/0.4.0'
Merge branch 'release/0.5.0'
Missed updating the code for 4.1 style single log file
Merge branch 'hotfix/0.5.1' into develop