Issue #8708 by tuj: Moved activation to own controller.