Isolate feature views
(cherry picked from commit e200e74)