Merge "Make refreshTimestamp atomic." into main