Checkpoint PR for apiman