BRANCH 4.8: fix to upgrade
BRANCH 4.8: fix to upgrade

Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC