am 42891165: Merge "Improve the generational mode."

* commit '4289116517f765df84820bf753fbf891986f40ca':
  Improve the generational mode.