change code and fix docs about checkpoint Upstream-commit: 047400c64c9a19fe9c20176dc9ca5d86301a91ae Component: engine