DSS-218: ContentTimestamps
Cosmetic changes