Merge "indexOfValueByValue now uses .equals"