Change --output to --output-site for test cases
Merge branch '4.3'