Re-render on feature changes
Merge pull request #1842 from elemoine/1798

Re-render on feature changes