Merge "Swap indexOf with contains"