APOLLO-2645 Time trait coverage increased