Issue #3416898 by Tom Konda, Tirupati_Singh: Use String.prototype.includes() instead of String.prototype.indexOf() where necessary
mentioned in commit 5eb8ab81