port QA files from 7.0