BRANCH 4.7: minor tweaks
BRANCH 4.7: minor tweaks

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