Merge pull request #1459 from nnnick/v2.0-dev-feature-time-axis

V2.0 dev feature time axis