Moved Characters
Merge origin/master