Improve parameterized test with parameter value in name
Test mergeBase in two additional paths
Merge commit '7f2fce7c65ad4ef1907afc4663129224bd742073' into HEAD