Feature Group added
edit-methods renamed
Merge remote-tracking branch 'origin/master' into featureGroup
feature rule