Merge branch develop
Versin RC
Merge branch origin/qa