Singleton ActionHandler
Merge branch 'action'