Merge "Create a redacted single line view" into main