Merge "Support comparing separate workspaces"