Merge branch '2791_path_encoding'