Merge "Refactoring of CPS Delta APIs"