Merge "Fix "Make as default" (there was an Id clash)"