Added missing modification to controller.
Merge branch 'feature-event-handler' into wakame-edge