Merge timechart branch.