Merge master to group-manager