Merge "Moved ChronologyProtector to its own file."