PIM-3145: Added comment controller