XD-1491, XD-1492 - renamed ContainerMetadata to ContainerAttributes