Merge "Use native str_starts_with/str_contains and such where possible"