Issue #3467271: Use String.prototype.includes() instead of String.prototype.indexOf() where necessary
Closes #3467271