Merge branch 'qa' into development

* qa:
Merge branch 'development' into qa

* development: