Merge pull request #5760 from saurabh6790/is_group_fixes

[fix] patch fix for fieldtype change from select to check for is_group