Merge "Remote legacy shortcut when failed to migrate" into main