updating dev to current QA