Merge branch '2791_path_encoding' into 4.8.1-stable