add QA files
Merge branch '6.1' into 7.0 and updated QA files