Merge "Enforce self.details as a collection" into stable/2023.2