Pull request to merge modifications to xip for the U4ID principal