Qa merge

merging versions