Merge "Support preferred data profile correctly"