Merge "Auto selected sub should never be actual default sub" into main