Merge branch 'time-stamp-refresh' into v2.0