Synced with CMS production and removed the views from feature