am 9af970f4: am e443fb72: Merge "Simplify maintaining the .dat file."

* commit '9af970f475ec4f873fe15ba68244be287febb2d7':
  Simplify maintaining the .dat file.