Merged extend-test-get-path into trunk