removed obsolete code
Merge branch 'master' into 17528_group_node