Merge branch '2491_find_file_relative_paths_stable' into 4.7.5-stable