Merge "Preserve notif group stucture in repository" into main