Merge "Throw exception if SP cannot be unwrapped during migration" into main