Merge "Cache Feedback Enabled Setting in Controller"