Merge branch '2804_test_path_cmp' into 4.8.1-stable