Add QA config file
Merge branch 'development' into qa