Merge change 24057 into eclair

* changes:
  checkpoint