Merge branch 'qa' into production
adding logging
Merge branch 'production' into qa