Merge "Add tests for user-initiated migrations" into mcp/antelope