Merge "dovetail: to support multi_testsuite"