WS: summary_lock
WS: hasta add attack
Merge Master