Revert "Removed expansion of feature group connections because it did
not work properly"

This reverts commit 178bdf0a8191d1324e42cbea88e2cddd640bef79.
Fixed expansion of feature groups - fixes #480