merge fixes
Merge branch 'qa'