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

Extend external timestamps switch