Some Improvements for FeatureWidget Extension
Merge