refactor
Merge branch 'master' into strategy_4
strategy finish