Switch indexOf
to includes
whenever possible
#2989
Merged
indexOf
to includes
whenever possible
#2989