Merge "Remove wrappers" into pi-dev