Update Features contrib module

In hopes of helping #3211