Merge branch 'master-qa' into cdominguez
Fix initScope conflic
Merge branch 'cdominguez' into master-qa