Fix CommandProcessor to use a singleton
Merge origin/master