Merge "Allow shortcuts to restore in any version" into main