Qa

Merge QA changes in to master.