Merge pull request #55565 from BBoozmen/oozmen_avoid_path_normalization