Merge "Revert "first patch of test submit""