Merge "Add two new display info fields"