Merge "Add new hidden API." into pi-dev