Merge "groupbased policy ui-rework"