Fix merge conflict
Merge branch 'QA_4_0'