Merge "DisplayContentRepository" into main