Merge Qa to staging

Merging branch QA to staging