Merge "Add two new debug log groups"