Merging changes from feature grouping angular 

Merging changes from feature grouping angular into master branch