Merge "Revert "More run-test with Jack""