Merge "Add checks to ensure SPIs are not reused"