Merge branch 'timefunc-new'