Merge \\"Support unlimited pending checkpoints\\" am: f84bef9dd7
am: 1fb249f473

Change-Id: Ic501076ba01c8c95f665695c060f4851990c233b