Merge "Better handling of duplicate default"