Update QA log file name
Merge branch 'development' into qa
Merge branch 'development' into qa