Issue #5935: Support timeline

Support timeline