Merge "Settings search for Carrier settings version" into main