Merge "Revert "second patch of test submit""