Merge "indexOfValue now uses .equals (cont.)"