ContentController -> ViewAction
Merge remote-tracking branch 'origin/playground/dragos' into playground/dragos