Merge branch 'qa/bugfix' into stage
bug fix
Merge branch 'qa/bugfix2'