Merge branch '2804_test_path_cmp'