Merge pull request #14226 from senny/14109_partial_revert

`includes` uses SQL parsing when String joins are involved.