Fixed initial team setting.
Merge branch 'master' into production