Merge branch 'master-qa' into egomez
Bug Fixes DONE
Merge branch 'egomez' into master-qa