Fixed QAAdapter bugs
Merge