Merge "TimeCheck: Update code to support a callback" into tm-dev