Extend timestamps switch
Merge pull request #4005 from guardian/extend-timestamps-switch

Extend timestamps switch