CMS-1084 Use simpler DI framework. Fixed command invoker.